From 5d8f8fa902685f4cceaf9e2b75da3c846956c2cd Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Thu, 11 Aug 2016 16:32:10 +0000 Subject: [PATCH] x86/boot: Align e820 and video data in the boot trampoline The undefined behaviour sanitiser in Clang 3.8 identifies that these are all misaigned when used in __start_xen(). Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/arch/x86/boot/mem.S | 1 + xen/arch/x86/boot/video.S | 1 + 2 files changed, 2 insertions(+) diff --git a/xen/arch/x86/boot/mem.S b/xen/arch/x86/boot/mem.S index 820aea9416..602ab2cd67 100644 --- a/xen/arch/x86/boot/mem.S +++ b/xen/arch/x86/boot/mem.S @@ -67,6 +67,7 @@ get_memory_map: ret + .align 4 GLOBAL(e820map) .fill E820MAX*20,1,0 GLOBAL(e820nr) diff --git a/xen/arch/x86/boot/video.S b/xen/arch/x86/boot/video.S index b238bf3af5..2aafbebfd8 100644 --- a/xen/arch/x86/boot/video.S +++ b/xen/arch/x86/boot/video.S @@ -994,6 +994,7 @@ force_size: .word 0 # Use this size instead of the one in BIOS vars vesa_size: .word 0,0,0 # width x depth x height /* If we don't run at all, assume basic video mode 3 at 80x25. */ + .align 2 GLOBAL(boot_vid_mode) .word VIDEO_80x25 GLOBAL(boot_vid_info) -- 2.30.2